Fix issues 37,38,44,48,54