fixes in for compact mode