Quick fixes for beta #1