Fixed a number of uppaal generation issues