Added some missing fixes