Misc extra checks