Fix some bugging