More Andy fixes, update to beta 6