Fixing some stuff with the custom element