Fixed issues with ghast