other fixes...