Final fixes for BETA 10 Release :)