Fix formatting, other minor issues