Half-bugfixes
Half-bugfixes