Minor changes to satisfy jscs