Fix for notices