[Fix] Serveral Bugfixes