Fix failing builds

partial fix for #456