some little fixups