Merged bugfixes
