couple more quick fixes