Bugfixes; project rebuild