Fix arguments and types on Rectangle