Minor fixes for basic types