Strange commit errors, hopefully works