Bugfix

General bug fix round.