[Not ready] Fixes

#88