Some sizing fixes