Fixes some position related issues