Fix status warnings