afew fixes