Fixes to life