notice fixes, for now using @ to suppress some strange notices