Small changes to remove warnings and let it compile