Various updates to suit Lively