Fixed: Yet some fixes