Updated _masters to return in two ways
Fixed a couple of compiler warnings