more fixes, can't think to come up with a decent commit message