BalajiN | Fixing startup issues