Fix issues with latest commit