Some small dirty changes