Trying to fix commit problems