Misceallaneus fixes