Fixed drawRoundRect and added drawRoundRectComplex