Release 1 Fixes