SMALL FIXES for ERRORS