Fix blockparam and blockmapper