Fixed lifetime compile errors