Fixed issues with the whistle