Slight bugfixes