- Minor bugfixes and improvements