Small fixes, disabled broken feature (autoformat)