Initial Error Fixes