[Don't merge] Multiple bugfixes