Small fixes cleanup