More 0.5 Fixes