Fixing some things that were missing