Some minor bugs fixed

- Minor bugs fixed in charts 15 and 19