Modified minor bugs