What size is the crate? I, personally, would look into getting a bigger one, like a size up or something.

Molly's crate was almost 4x too large for her when she was a tiny pup, but she was fine in it, no accidents, she loved it.

I think Charlie is fine, but if he were my dog, I would exchange for a slightly bigger one. (Go to the next largest size)