Crush bugs fixed