Added some minor fixes