Some fixes, working for beta testing