Hopefully some final fixes