fixes and guava