Fix warnings

Incudes #245.