Small bugfixes with committing