Fixed ALL fatal errors