Signed commit, and small bug fix