Fixes and fixed notices