Small fixes [work]