Small fixes and few debugs.