Added startup checks