Fixed issues with 0.1.1 patch