1. Minor fixes regarding double/float