BUG Merge fixes from SWC@SDU