Implement various fixes from Major-/Apollo