Some tiny back fixes