Engineering small fixes