Misc

Small fixes