Fixing some little out of date stuff