Fix some problems from rebase + remove whitespaces