Fixes size bugs