couple minor ocd bug fixes