Fixed issues created by last commit