Small fixes and change for easy adding