Small fixes so rectangle could build