Fix additional wait-startup checks