Hopefully better startup now