Fixes for CUPCAKE server