Minor fixes :panda_face: