Fixed trivial issues