BETA 1.0 Fixes