Feature/beta fixes