Bugfixes in parrot module