o.c.ams.*: Small changes to avoid compiler warnings.