Some misc stuff for better saga compatibility