fixes for stupid unit ..