Fix issues with previous changes