Dot notation errors

Pull in changes from this branch