Various issues fixes (See commits)