last minute fixes for beta 5