Misc to remove warnings