Fix unchecked errors while drawing; lint fixes