no need to worry an for side bottle issue this is the routine matter and you have to add the water even in cultus after a week as they have not good cooling system.
for oil change you must be careful on oil change that there must be no over filling and also please mention how much oil is less when you measure the oil in the flask or the workshop guy have measured.
Also please share the dip stick level too`