Updated minor fixes