dev check fixes