Fixing build minimally