havent worked on one of these yet, but it sounds as though its your actual guage cluster that may have a loose something. these two warning lights are not usually wired up on the same circuit.
if no go, have a sparky check your alternator and warning lite circuit because that is what the battery light is telling you to check. if it is faulty it may be messing with your globe sensor which is current sensing.