fixing some glitches for compact scenario