BUG Fix issues in master