Fix some shtuff