Small fixes during trials