Fix Tanks filling and added safety check on load