Added some basic fixes