Fix some positioning issues