Minor changes, fixed weird issues