Fix key paths
Fix status command errors when not yet initialized