Fixes to xenon tank