Minor fixes, probably final commit =)