Yet another boring fixes