Fixes for capitalization