Remove absolet hack
Small tweaks