Fixed issues foudn in review