Fixed building after recent commits

Closes #1257