Fixed minor issues with last commit