Added potential bugfixes