Tweaks until I can update to 1.8 stable