A bunch of bug fixes in tralsation to Alloy