Fix for a few things