Hopefully fixed commit errors