Fixes for spacing