Bug 45/46/48 fixes