Cleanup after fixes