Fixes for two bugs and sizing issues