More bug fixes, retard