Fixed issues listed on github