Fixed merge/other misc issues