some different fixes