Fix #50, #51, #52 for all files