Minor giu fixes and codecleanup