Msicellaneous fixes