Bug fixes beta