Units bugfixes