Draw methods, some common fixes