Bug Fix's