Small fixes and ideas