Fixes for Lunchbox