Cleaned up to tighter gnat checks