Removed Remaining Compiletime Errors