Small fixes and ground block