Small fixes and clean