fix a couple long standing issues