Few More Console Error Fixes - Thanks Neo2003