[DO NOT REVIEW] A few small fixes