Fix some Bugs agains