Added first round of minor fixes