Bits and pieces

@alejwalker