Bugfixes & Polymorphic functions