Alfa update - Some minor fixes. UNSTABLE