more code check fixes