Fix issues with previous commit