general fixup things