More aggressive checking & small changes