PagodaBox Fixes v1.1