bugfixes for relase