Small fixes with regards to cleaning