Fixed some Double/Int - Errors