More caps fixes