Small fixes, git dirtyness works again