Fixing some missing bits