Fix some Errors