Added a few forgotten stuff