Minor changes + fixes