Fixed issues with this branch