CheckStyle fixes