Change version properly to 1.15
Small changes and fixes