Formmating fixes