quick and dirty bugfixes