Bugfixes na merge