Fix some these stuff