Some little fixups