Package check fixes